gtkmenu: Fix potential use of uninitialised variables
authorPhilip Withnall <philip.withnall@collabora.co.uk>
Wed, 20 Nov 2013 17:31:28 +0000 (17:31 +0000)
committerPhilip Withnall <philip.withnall@collabora.co.uk>
Mon, 2 Dec 2013 10:36:26 +0000 (10:36 +0000)
The child_height out variable is only valid if compute_child_offset()
returns TRUE.

Found by scan-build.

https://bugzilla.gnome.org/show_bug.cgi?id=712760

gtk/gtkmenu.c

index d9cb6482fef1bbf529a457ae342af39ab33ee6a3..43dbb28ae55b564b9e17c60f414f1e228d9a4f37 100644 (file)
@@ -5414,9 +5414,9 @@ gtk_menu_real_move_scroll (GtkMenu       *menu,
           {
             gint child_height;
 
-            compute_child_offset (menu, menu_shell->priv->active_menu_item,
-                                  &child_offset, &child_height, NULL);
-            child_offset += child_height / 2;
+            if (compute_child_offset (menu, menu_shell->priv->active_menu_item,
+                                      &child_offset, &child_height, NULL))
+              child_offset += child_height / 2;
           }
 
         menu_shell->priv->ignore_enter = TRUE;